Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 05:27:12 +0000 (22:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 05:27:12 +0000 (22:27 -0700)
commit5eb4b44d6292109f3d9ae2edbf045d402a4e7466
treedbb9622ab979b0b4f8c542137ab2d0a687045aa3
parentb302a57542977105b15c0475c524b4a34d70dda3
parent62ef2c5624c4aee6ef336e1326ec6078d8f7af00
Merge from trunk.